whoops should be IV not 4
a few small mastermerge updates