Add more animation types. Improve some others. Better compile