Trying again with bugfixes