Merge "Generally refactor JJB docs"