some more fixes. I still think this should
be in /xtrn/ but digitalman disagrees.
but he's from california. what does he
know?