this week's batch of bugfixes