Minor corrections (missing whitespaces, unifying of names and field-specific expressions, ...)

Merging Konrads corrections.