Some method javadocs
Fixed animation wrapping
Cleanup