various bugfixes from the transition