+javadocs
Small update Simulation
Merge with Hidde