WIP more dojo migration, various bugfixes