buffers + minor cleanup
initial commit