Cleaned up weather, minor tweaks elsewhere.