Documented the parser and made some minor refactorings.
Made hi2 up-to-date with the errge repository.