transitions, fixes
Merge remote-tracking branch 'kaumgeschlafen/master'