Continue expanding Signature use and fix some broken bits.