tried to fix some cell reuse issues