more keywords and some cleanup