MOD: replace subtargets, bugfixes