Added new weatherstation type, and some minor refactoring