made changes to gemfile and other small changes in class

https://app.asana.com/0/11169835259596/11169835259598