-rework signing to sign everything in one loop