cleaner target selection; bugfixes