cleanup of the docs and better highlighting