minor cc-adjustments; unified previous and next target selection