forgot to check in a bunch of fixes