I put a few drops of lavender oil on a piece of cloth and put in his crib close to his head. it makes babies sleep soo much better, my sister taught me this trick and it was very helpful. Or rubbing some baby lotion with a drop of lavender oil into his forehead.
Besides a bath every night before he goes to bed, make sure there are no sudden noises. Like a phone dropping or the tv going from low to loud in one scene.. I also kept my room dark at night so he would getting into a routine of darkness for sleep n lights on for play..