diff --git a/cryptest.nmake b/cryptest.nmake
index 933179d5..5819f238 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -61,11 +61,16 @@ LD = link.exe
 AR = lib.exe
 RM = del.exe
 
-CXXFLAGS = /nologo /W4 /wd4511 /wd4156 /D_MBCS /Zi /TP /GR /EHsc /MD
+CXXFLAGS = /nologo /W4 /wd4511 /wd4156 /D_MBCS /Zi /TP /GR /EHsc
 LDFLAGS = /nologo /SUBSYSTEM:CONSOLE
 ARFLAGS = /nologo
 LDLIBS =
 
+# Debug build
+# CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd
+# Release build
+CXXFLAGS = $(CXXFLAGS) /DNDEBUG /D_NDEBUG /Oi /Oy /O2 /MT
+
 # Attempt to detect when <sdkddkver.h> and <winapifamily.h> are avilable
 #   http://stackoverflow.com/q/40577415 ?
 !IF "$(WINDOWSSDKDIR)" != "" || "$(WINDOWSSDKLIBVERSION)" != ""
@@ -119,7 +124,7 @@ LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib
 
 !IF "$(PLATFORM)" == "ARM"
 # CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
-# CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
+CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
 # CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP
 # LDLIBS = $(LDLIBS) ws2_32.lib
 !ENDIF
diff --git a/poly1305.h b/poly1305.h
index 3cf37121..aecec7d0 100644
--- a/poly1305.h
+++ b/poly1305.h
@@ -103,6 +103,7 @@ protected:
 
 //! \class Poly1305
 //! \brief Poly1305 message authentication code
+//! \tparam T class derived from BlockCipherDocumentation with 16-byte key and 16-byte blocksize
 //! \details Poly1305-AES is a state-of-the-art message-authentication code suitable for a wide
 //!   variety of applications. Poly1305-AES computes a 16-byte authenticator of a variable-length
 //!   message, using a 16-byte AES key, a 16-byte additional key, and a 16-byte nonce.