#36 fixed, removed character buffer manipulation mystery code.