Fixes #463 and some Erlking minor typos I spotted whilst checking for some crash issue.