more code review changes
Work around bad data that leads to invalid concept names.

While fixing the build process, document it a bit more.