Lots of fixes for weather project