merge fixes.
Basic play controls for party mode.