#213, tighten up animation start/stop behavior