Added weather and changed some formatting