1. context lookup mechanism improved
2. grammar refactored - added readability