Made some progress on fixing all the merge bugs, lots to do!