some fixes to the transitions