Fix incremental field configuration and logic, PEP8ery, add optional efficiency group name ordering