CBL Concepts: misc updates + incorporated Jessica's comments