Merge in process management and other fixes from conceptboard

Merge in process management and other fixes from conceptboard