Fixes to mis-use of double quotes. Got rid of duplicate code surrounding table element definitions.