Fixed parser bugs; queens.tig and merge.tig parse