event tracking fix and minor adjustment
event tracking fix and minor adjustment