diff --git a/Makefile b/Makefile
index 4ce5a30..a1c6d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 CC = clang
 CFLAGS = -O3 -std=c99 -pedantic -Wall -Wextra -Werror  \
-  -mssse3 -maes -mavx2 -DMUST_HAVE_AVX -mbmi2 \
+  -mssse3 -maes -mavx2 -DMUST_HAVE_AVX2 -mbmi2 \
   -ffunction-sections -fdata-sections -fomit-frame-pointer -fPIC \
   -DEXPERIMENT_ECDH_OBLITERATE_CT=1 -DEXPERIMENT_ECDH_STIR_IN_PUBKEYS=1
 
diff --git a/goldilocks.h b/goldilocks.h
index 1f94dd0..feba5e9 100644
--- a/goldilocks.h
+++ b/goldilocks.h
@@ -148,13 +148,13 @@ goldilocks_sign (
  * @warning This isn't even my final form!
  * @warning This function contains endian bugs. (TODO)
  *
- * @param [out] signature_out Space for the output signature.
- * @param [in] message The message to be signed.
- * @param [in] message_len The length of the message to be signed.
- * @param [in] privkey My private key.
+ * @param [out] signature_out The signature.
+ * @param [in] message The message to be verified.
+ * @param [in] message_len The length of the message to be verified.
+ * @param [in] pubkey The signer's public key.
  *
  * @retval GOLDI_EOK Success.
- * @retval GOLDI_ECORRUPT My key is corrupt.
+ * @retval GOLDI_EINVAL The public key or signature is corrupt.
  */
 int
 goldilocks_verify (