Metadata fix, comments