finish animations and bug fixes