Fixed errors, improved timers and simulation. Added new stats