fixed animation and whatnot