Merge Fixes for Issue #2

Made changes to celltypes and subtypes