included more keywords, and a fix on scanning identifier right before colon