small fixes
 running some simulations
 merge