He is! Finally. Just the last couple of weeks he has gotten way better at sleeping through the night and his naps.