refactor tracking

allow search events, better logging + no reference to eVars or props!
Merge pull request #7 from peter-mouland/patch-1

refactor tracking