Performance improvements

Merge branch "profiling" into "master".

Several small changes that decrease the simulation's computation time.