Improve Sun's Song

Adds only enough time to get to either dawn or dusk