Fixes, further parallelisation of em code.
Merge branch 'em2' into nanoporeHacks