bugfixes from new hpc run