Minor changes to autoloading and layout. Begin with users tomorrow.