use 'on' correctly
tweaks
minor refactoring and implement optional link-to-term instead of popup