omitted a couple of redundancies
reorganized a couple of parameters, the simulation.c now holds all definitions for constant values
resolved conflicts