fix html generation (?), add captions