Corrected some signals, FSM should be done (#2)