#154, #153 and I changed CharBuf to be a PrintWriter