Started clean up of buffer interaction code.Still a little buggy