some transition bugs fixed