animation fix

Fixed animation so it drops (and stops) properly. Merged Lorena's code
as well. This should be "current" before merging Susan's code into the
js.