I’m sure you have read everything already, but my tips are daylight all day, darkness and quiet for bedtime. Set your routine early (we do last feeding, bath, PJs, book and bed by 8pm), sometimes earlier if he is showing sleepy signs. Good luck!