Fix explosions.
Tidy up Cell creation.