Added a few new keywords
Improved handling of nested comments