minor changes
merge
made GUI runsimulation faster