naming, fixes and cleanups

- CHG: hover* to highlight*
- CHG: code cleanups
- FIX: minor fixes