Madsen weather

Fixed and tested issues in weatherModule.