fixes for multiple targets and especially CIDR mode