Animation tweaks and input hack