Mostly _ fixes
check object/uri fields
camelCase fixes, check URIs