Fixed docs / reorganized augroups