Made setTag / addToTag and related functions less stupid.  Still pretty stupid, but less so now.
Update events to use tag helpers and onTick format.