ordering and autodoc changes