transitions and some fixes

(bored at work during lunch)