Final bugfixes. Should be pretty much ready for release.