Commtrack tweaks

read commit by commit for the details