Add tracker support, minor fixes and enhancements