Integrated changes from Chris, and the up to date changes from cleaning up the code. This was all tested on some GRUs from the Australia basin and also the laugh tests for both V3 and V4.