a few essential fixes, moved commands around. moving animation in