Bugfixes -- probably broken more though.