Fix comments formatting
Fix mutiple buffers management