Some quality of life fixes

Dunno if you want to leave the sources out of your gemfile so it's a bit more portable or not.