transitions and bugfix