Fixed a bug with the GenRun optimization - which should probably be disabled.
Started implementing collect parameters.