Doc improvements
Tests passing on Py3