This patch:
	(a) updates some comments
	(b) adds some debugging
	(c) fixes CB and CBI data stages
	(d) adds some missing {'s and }'s -- only dumb luck let the old
	version compile.