Sir Trevor fixes

Fixes #208 
Fixes #215