Parameterized bufferSize
Fixed comment
Add remaining EventMask values