Some bugfixes, mainly.  Tests are still buggy, but I'm not worried about them.