WeatherInfo in separate file.

Small fixes