Add autoload and fix a few stray lines
Version 0.2