some cell tracking fixes