refactor
cleanup done
external fix
old make_injector
injector works