Adds ComplexMachineSpecies.
Fixes a couple of bugs in the simulation.