some animation glitches removed