Fixes
Resolve Type hierarchies correctly

- plus temp disable focus/refocus stuff
Merge pull request #21 from wiredearp/master

Fixes