Also moved some code around, renamed some things here and there, fixed some tests, ... Many little changes. You know how it is.

Also renamed some classes again.

The culprit was the way the remaining delay had been distributed over the edges connecting them with each other.