Added more features to Weather and cleaned up the code a bit