removed option to deactivate fields via setting to None, minor bugfixes