Simplified the FanOn grammar, spelling fix, Main organization.