manual tracking: some minor bugs