Progress on FSM

Plus rm'd a trailing whitespace.