adjusting autoload fixing bugs