Added better temp parsing