Many small corrections.
More corrections to reflect actual usage.