Grammar + Gemfile fixes

Thanks @sebrose