Documentation tweak
Tests! And fixes
Misc hacking