Add tooltip
Clean up code.
Notifies of selection changes
Fix selection and save.