markup fixes

markup fixes
update for new CB version