add sunrise and sunset times to weather announcement, simplify weather code