A system and method are presented for improved performance of gerotor compressors and expanders. Certain aspects of the disclosure reduce porting losses in a gerotor system. Other aspects of the disclosure provide for reduced deflection in lobes of an outer rotor of a gerotor system. Still other aspects of the disclosure provide for reduced leakage through tight gaps between components of a gerotor system.