Some formatting changes, removing unneeded macro values of cell types, and adding missing cell types.