a bit more work on encounters
minor format fix
more work on #26
cleanup and docs for v0.5