MAINT: Comments from charris and some extra documentation