added cl switch for s/m
more fixes