add bare word/number parsing
use bufio.Reader instead of io.Reader