a few fixes on filenames & tables