Add --nolink command line switch to speed up manual debugging
Fixes to table label classifier and merge options