Fixed bugs, enright simulation works now