Nicolet events/annotations

Bugs
, ,
14

Both issues are resolved as far as i can tell. Thanks.