fixed sunset/rise bug; refactored messaging