better CL parsing