Adding alternative fit mode, plus some more useful verbose output