Added candidate vector to Cell; misc. cleanup