membership cleanup
fixes for PR and broken membership stuff