Moved weather, some clean up