New transitions and minor fixes