cleanup bufio
cleanup dbuffer
cleanup bufio
rearrange tsc and cleanup header