fixes
removing binding.pry
Merge branch 'feature/fixes'