Fixes, further parallelisation of em code.