merged dans stuff into this version

cleaned up some of the animations