Minor changes; now (sort of) builds into a package