test setup
merge
fixed typos, proper simulation loop