Added macro update when using SP reset. Refactored several packages containing general classes. Fixed "worker" nomenclature in class methods misleadingly denoting "task".