Ready for merge

Fixes Mouse over heal.
code clean up.
correct version.