misc fixes (inc 0001032: No heading tags inside th tags)