Updates from my v2.0.1-dev branch

Mostly merges that were already in yours.

The only new one I got from iniju today is uncommenting the logs.
It seems reasonable to have that in since we might get useful info from beta testers.