Touch ups & add enable/disable weather