Integrated CL suggestions and other minor changes