Use autoload, doco updates