minor improvements on CL extensions and related stuff.