Buffer working and adding some comments.