fixed weather problem
fixed weather, merging in