more improvements to tie handling