dismiss button, metadata fix, etc