Fixed one transition bug
Changed a couple transitions