Fix timestep option
switch between fixed and dynamic timesteps
Added TODOs ;-)