Fixes in cl file. Tested and correct