Bunch of minor changes to get BORG added to the party