fixed some transitions and timing