Added editing of parties, cleanups