rename things as suggested
improve comments and tooltips