Comments and cleanup with table additions