further cleanups
added tracking code