more tracking fixes..