Merge cleanup

Still figuring out this tortoise merge gui. Had to manually fix up some
stuff