more cwt fixes and reports