more changes to use buffer system with s" stuff
more buffer updates