second test and nicer formatting

looking good; i think the change for checkin can stay in place, so that
now we always do a careful update before committing.  makes perfect
sense in this ordering, and i don't know what screwy problems i was
having before with that order but they seem to be gone now.
also checkin and puffer outer scripts have better formatting.