Add bundle install, minor cleanup