Tweaks to validate_selection & experimenting with debug options