Sir Trevor fixes

Fixes #208 
Fixes #215 
Fixes #175 (or, would, if we had an event handler we could use; I don't think this should stop us from merging though and waiting for upstream to fix or provide an alternative)