macs retain history
add scrm pruning simulations
Merge branch 'master' into jz