okay let's see if i can commit this time (includes latest tarball)