misc changes; autoloader