further bugfixes, new target