tracking bug fix and minor tweaks