updated autoloading behavior, minor cosmetics