Started implementing next set of buffer functions. Cleaned up some comments and code paths