More stuff.

Closes #109, closes #112, closes #111, closes #92, closes #99, closes
#93.