Misc changes

I work at Twitter, I wrote this on Twitter's time, and Twitter has a CLA with Facebook already.