Added new type of weather and add better handling if weather words not found