Model fixes
Rename metadatasettings as they seemed to be confusing
Release preparation