Added additional cell types. Bug fixes.