KS: more small changes