remove injection, various bugfixes