various fixes and autoEllipsis tweak