updates and tweaks.
added more event tracking.