Merge updates to Create Typical in ComStock into this repo

[DavidGoldwasser]

Not sure if want to bring all changes over or only subset that are generally usable for other workflows.