Update plotting and clustering

Executable building doesn't play nicely with multiprocessing.