half a year's worth of bugfixes