transition edits and various bugfixes