Weather module and bug fixes

Just little improvements.