Extended/corrected the output as req in #97

Also added extra text to table captions.