improved Table
minor mods