missed a bit of npr cruft.
Fixed a few bits of encoding weirdness... I think.