fixed some problems in cl