adds Bundler, fixes some minor issues