Changed around the FSM some

made it more readable, and take less memory for multiple of the same
FSM.