major buf fixes...too many commits!