Removed the Cell Class, fixed some bugs

I decided that the Cell class will be added in the future, as it's too
much work for me to do now. I at least fixed some bugs.