Require rather than use, when it is conditional
Remove TODO now
Fix syntax errors in the RDF meta info
Autoupdate files