Small fixes + results of a simulation run
Much simpler and faster simulation