collisions no longer broken to fix #43, better animation handling