More fixes to #418

I THINK that might have taken care of all of the non printable characters. Gonna have to find a better way to handle this.