FSMs fixed. Fixed several FIXes.