Fixing class diagrams and commenting