Fix searchpath
Improve performance of lots of includes (needs refactoring)
Fix parents on wrapper objects
Break out of loop early