Ocean Filler Fixes and Foundation for WeatherBox