fixed and finished Cell class