Better cell handling
[Fixed] Some bugs