Updated Party System somewhat, plus event work