targets switch, tweaks