A few tweaks

I tightened up syntax in a few places and fixed the Gemfile.