update old comments update or delete deprecated definitions complement forgotten updates adjust spacing some cosmetic changes
Redo of #2939 rebased against RCBugFix