- steering better modularized, fixed bug in uistatemachine