a bit of parser refactoring and documentation modification