mostly reshuffling and language fixes

the bulk of the work was done by Others Than Me (TM).