tidy up alerts and fix timer clears