Fixed comment and added buffer-string