merge class-cleaning
improve tooldisplay