CBL Concepts: misc updates + incorporated Chris' comments