keywords and clean obsolete iuses plus minor qa fixes