fix some remaining key words.