[TASK] CGL and cleanup, general improvements