Added nautical and astronomical twilight
Renamed, and deleted dead code