Begin to speed up and simplify diffusion calcs after profiling. Still could be improved. Also touched up style and docstrings.