latest fixes + signature