Additional metadata fixes and comments
Build files from previous fixes