Bunch o' stuff ...

Closes #91, closes #106, closes #95, closes #108, closes #107 and
closes #98.