Update order and variable names

No longer using wunderground but Open Weather Map.