Added weather and map locations, cleared messages code