orcmd kw fixes
Merge branch 'kw_fix'