more cl/tcl changes