Some further work on getting EV calculations right (still some bugs)