update reserved words list and make underscore regular variable name