makemetadata: much cleanup and simplification
makemetadata: add chapter data (just in case)