Call internal checker more often
Added information on all internal cell types to internal checker
Cleanups and bugfixes in response to new internal cell checker