fixed typos and changed descr. of Geometry fields (merged from master)