Fixed some animation issues and class options