Fixes with party commands
(pt2)
pt3
(pt4)
(pt5)