regenerate target; bugfixes;