fixed autoload
merged drew's changes