Correct the autoload lines. Update comments.