updated tracking and code cleanups