Autoload sample file, minor cleanup.