add watch table
remote old skip table, create new one
make some small fixments in tools
small fixments