Initializer fix
Merge remote-tracking branch 'effin/new-weather' into new-weather-rework
Minor consistency fixes
Merge pull request #1 from wito/new-weather-rework

[WIP] Some cleanup