removed some | from tables, still much to do