improved hijacking, mixin-factory and error handling