Fix regex to match reserved words
Add a list of reserved words