Some sphinx-ing and consistency fixes