Improve gemfile and config