Fixed bugs. Added notifications for buffering