fixed the transition bug and whatnot