Admin: minor style tweaks. Submodule clean up