Added changes made today (5/8/2014)

Simulator, some fixes
Still have to diagnose statistical matching.