Removed all warnings except for in weather.  The unused variable in weather is used for demo purposes
merge