Added 'allow_deep_values' opt/feature + misc