diff --git a/Makefile b/Makefile
index 115ea84..ef8dcde 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ depend: .depend
 
 clean:
 	$(RM) $(OBJS)
+	$(RM) main
 
 distclean: clean
 	$(RM) *~ .depend
diff --git a/Makefile.win b/Makefile.win
index cc803ff..6a2808d 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,7 +1,7 @@
 CC=x86_64-w64-mingw32-gcc
 CXX=x86_64-w64-mingw32-g++
 RM=rm -f
-CPPFLAGS=-Wall
+CPPFLAGS=-Wall -std=gnu++17
 LDFLAGS=-static
 LDLIBS=-lm
 
diff --git a/main.cpp b/main.cpp
index 658a71a..baa1e83 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,8 +5,8 @@
 int main(int argc, char **argv) {
     int numDigits = 0;
     if(argc < 2) {
-        std::cout << "Usage: spigot <numDigits>" << std::endl;
-        return -1;
+        numDigits = 50000;
+        std::cout << "Defaulting to 50000 digits..." << std::endl;
     } else {
         numDigits = std::atoi((const char *)argv[1]);
     }