ensure only valid pairings are saved.
minor ui and flow updates.