Adds option to disable party command; Cleanup