some cleanup, particularly of input parameters
move in some basic simulation framework