Major doc changes for sphinx compatibility