WIP: better simulations + DOC