Touch-ups to UI and rules.