sort the commentary into the right place
make the customize clearer
make autoloads