UPDATE: Thunderstorm warning cancelled, tornado watch continues