minor improvements to handle stops in watinting mode