sry, I removed all of the extra diffs but then added them back by git commit -a. I'll fix them all again.