Add some changes to cell
Some fixes
Some changes