Fix numerous bugs, add entity classes, etc.
Merge https://github.com/theSwordfish/adventure