fixed queue handling (Whew!)
fix transitions