Bugfix: remove highlight via API
Changed the way onload handlers are being attached
Cleanup
Fixed merge conflicts