more a11y fixes
s/derived/wrapped
Add some tooltips