Fix function-name typos. Callers don't have the typos.
Cleanup comments-typos,trim trailing whitespaces.
Correct more cases of addresse (no "s"), & in entity file