fix #1473 -- previewimage compat with subdirs

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
fix #1471 -- use ADDITIONAL_METADATA with twofile

Signed-off-by: Chris Warrick <kwpolska@gmail.com>