Fixed Signature Calculations

Fixed calculations and removed debugging echos.