And the final bit of bugfixing.