bundle update and fix some rubocop issues