fixed some inconsistencies in transition timing