Comprehensive overhaul of CL according to feedbacks.