Finish commenting BufferedStack
Update BufferedStack, resolve merge conflicts