add a couple tracking bugs