M.L.
If you want to pad his bed time routine with a little extra attention, but when you tell him it is time to go to bed- remain firm or you will be teaching him to disobey you and try to get out of what he should be doing. Holding firm to the idea that bed time is bed time, no playing around will pay big dividend down the road.
FYI soon he will be trying to ask for drinks, etc after you tuck him in. Don't give in. I would remind my son to get a drink before getting in bed. Any other requests after "good night" got a response of "The human body can survive for several days without water, you can make it till morning." I also used "mommy is off duty"
and when he started potty training, I would give him 2 minutes to use the bathroom then he has to wait an hour before going again. (by then he is asleep)