some improvements on CL extensions.