Fixes to simulated data, still not working properly