fix 8 bit stuff
Tweak regexp usage