Fixes to Encounter class (typos, removing excess code, etc.)