finish first table
fix some watchers