Faster animation and bug fixes