MacroSimulator: update with explicit node modelling and clearer
parameter settings