Change to table tag in Module Name & Serial Number

And fix some.