redid all transitions, a few other things.