event tracking fix and minor adjustment