diff --git a/bench/bench.hs b/bench/bench.hs
--- a/bench/bench.hs
+++ b/bench/bench.hs
@@ -43,13 +43,13 @@
                                     , bench "ECDSAp256 sign" $ whnf (basicecdsa (BS.pack [0..255]) rand) rand
                                     , bench "ECDSAp256 verify" $ whnf (\x -> basicecdsaVerify pub (r,x) (BS.pack [0..255])) s
                                     ]
-              , bgroup "Ed25519" [ bench "sign" $ whnf (benchED sk) 1
-                                 , bench "verify" $ whnf (verifyED pkfix sigfix) 1
+              , bgroup "Ed25519" [ bench "sign" $ nf (benchED sk) $ fromInteger k13'
+                                 , bench "verify" $ nf (verifyED pkfix sigfix) $ fromInteger k13'
                                  ]
               ]
 
-benchED sk n = let m = BS.pack [0..(255+n-n)]
+benchED sk n = let m = BS.pack $ [n, 0..255]
                in ED.dsign sk m
 
-verifyED pk sig n = let m = BS.pack [0..(255+n-n)]
-                in ED.verify pk (BS.append sig m)
+verifyED pk sig n = let m = BS.pack $ [n, 0..255]
+                    in if ED.verify pk (BS.append sig m) == Right ED.SigOK then True else False
diff --git a/eccrypto.cabal b/eccrypto.cabal
--- a/eccrypto.cabal
+++ b/eccrypto.cabal
@@ -1,5 +1,5 @@
 Name:                eccrypto
-Version:             0.2.3.1
+Version:             0.2.3.2
 Synopsis:            Elliptic Curve Cryptography for Haskell
 Description:         Elliptic Curve Cryptography in Haskell, evolved for correctness and practical usability from higher-level libraries.
                      .
@@ -10,14 +10,14 @@
                      Also the scope was changed by selecting best internal formats and no longer trying to be overly general, allowing more optimizations.
 License:             BSD3
 License-file:        COPYING
-Copyright:       (c) Marcel Fourné, 2009-2019
+Copyright:       (c) Marcel Fourné, 2009-2025
 Author:              Marcel Fourné
 Maintainer:          Marcel Fourné (haskell@marcelfourne.de)
-Category:      Cryptography
-Stability:       beta
+Category:            Cryptography
+Stability:           beta
 Build-Type:          Simple
 Cabal-Version:       >=1.9
-Data-Files:      README
+Data-Files:          README
 Extra-Source-Files:  test/P192
                    , test/P224
                    , test/P256
diff --git a/src/Crypto/Common.hs b/src/Crypto/Common.hs
--- a/src/Crypto/Common.hs
+++ b/src/Crypto/Common.hs
@@ -27,7 +27,7 @@
                      )
        where
 
-import safe Prelude (Num(..),Int,($),(+),(-),fromInteger,Integral,Integer,(>),toInteger,maxBound,quotRem)
+import safe Prelude (Num(..),($),(+),(-),fromInteger,Integral,Integer,(>),toInteger,maxBound,quotRem)
 import safe qualified Data.Bits as B (Bits(..),FiniteBits(..))
 import safe qualified Data.Word as W (Word)
 -- import qualified Data.Vector.Unboxed as V
diff --git a/src/Crypto/ECC/Ed25519/Internal/Ed25519.hs b/src/Crypto/ECC/Ed25519/Internal/Ed25519.hs
--- a/src/Crypto/ECC/Ed25519/Internal/Ed25519.hs
+++ b/src/Crypto/ECC/Ed25519/Internal/Ed25519.hs
@@ -16,7 +16,7 @@
 -----------------------------------------------------------------------------
 
 {-# OPTIONS_GHC -O2 -feager-blackholing #-}
-{-# LANGUAGE Trustworthy, ScopedTypeVariables, NoImplicitPrelude #-}
+{-# LANGUAGE Safe, ScopedTypeVariables, NoImplicitPrelude #-}
 
 module Crypto.ECC.Ed25519.Internal.Ed25519 where
 
diff --git a/src/Crypto/ECC/Weierstrass/ECDSA.hs b/src/Crypto/ECC/Weierstrass/ECDSA.hs
--- a/src/Crypto/ECC/Weierstrass/ECDSA.hs
+++ b/src/Crypto/ECC/Weierstrass/ECDSA.hs
@@ -12,7 +12,7 @@
 -----------------------------------------------------------------------------
 
 {-# OPTIONS_GHC -O2 -feager-blackholing #-}
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 
 module Crypto.ECC.Weierstrass.ECDSA ( basicecdsa
                                     , basicecdsaVerify