Begin stubbing in some features that won't be making it into the first v2.0 release, and some incidental fixes along the way...