various fixes, etc. from Dru's list.
	mostly membership stuff.
	started working on a table of conflict resolution.