fixed up animations and controls