further Keyword improvements