minor tweaks on transition