Loads of bugfixes, etc.