Gemfile & some minor changes