Couple of minor bugfixes, edits in metadata, etc.