More connections fixing and work on yeta wrench overlay