3.6/dev intrepid lwright events

A few small changes before the meeting.