Further refactoring.
Comments added for BEI.
Bug fix.
Merge pull request #141 from blackhydrogen/basic-encounter-info

Basic encounter info