reseting fields in non-class namespaces ...
minor changes