changing target for event/property will check for valid components before removing keys, some tweaks