diff --git a/css/pdf.css b/css/pdf.css
new file mode 100644
index 0000000000..599c1aaa33
--- /dev/null
+++ b/css/pdf.css
@@ -0,0 +1,4 @@
+a:after {
+    display: none !important;
+}
+
diff --git a/tool/parse_pages.py b/tool/parse_pages.py
index 05bd1120ab..667971bbf9 100755
--- a/tool/parse_pages.py
+++ b/tool/parse_pages.py
@@ -69,7 +69,6 @@ def parse_markdown(md, target=DEFAULT_TARGET, pages=None):
     #buttonize links ending in >
     print("buttonizing try-it links...")
     buttonlinks = soup.find_all("a", string=re.compile(">$"))
-##    print("buttonlinks:",buttonlinks)
     for link in buttonlinks:
         if "class" in link.attrs:
             link["class"].append("button")
@@ -94,7 +93,6 @@ def parse_markdown(md, target=DEFAULT_TARGET, pages=None):
         print("done")
     
     print("re-rendering HTML")
-    #html2 = soup.prettify()
     html2 = str(soup)
     print("done")
     return html2
@@ -254,13 +252,13 @@ if __name__ == "__main__":
         print("making a pdf...")
         make_pdf(args.pdf)
         print("pdf done")
+    
     #Not an accident that we go on to re-gen files in non-PDF format
+    print("rendering pages now")
+    render_pages(precompiled=args.pre_parse, target=args.target)
+    print("all done")
     
     if args.watch:
         print("watching for changes...")
         watch(args.pre_parse, args.pdf, args.target)
-    else:
-        print("rendering pages now")
-        render_pages(precompiled=args.pre_parse, target=args.target)
-        print("all done")
     
diff --git a/tool/template-forpdf.html b/tool/template-forpdf.html
index bf3a98649e..36a0b0738f 100644
--- a/tool/template-forpdf.html
+++ b/tool/template-forpdf.html
@@ -40,6 +40,8 @@
     <link href="css/main.css" rel="stylesheet" />
     <link href="css/custom.css" rel="stylesheet" />
     
+    <link href="css/pdf.css" rel="stylesheet" type="text/css" />
+    
     <link rel="shortcut icon" href="favicon.ico?v=2" type="image/x-icon" />
     <link rel="icon" href="favicon.ico?v=2" type="image/x-icon" />
     
diff --git a/vendor/flatdoc/v/0.8.0/theme-white/style.css b/vendor/flatdoc/v/0.8.0/theme-white/style.css
index a55c8682de..c3fa03fe01 100644
--- a/vendor/flatdoc/v/0.8.0/theme-white/style.css
+++ b/vendor/flatdoc/v/0.8.0/theme-white/style.css
@@ -122,7 +122,7 @@ input {
 }
 a {
   color: #3a87ad;
-  text-decoration: none;
+  text-decoration: underline;
 }
 a:hover {
   color: #228a8a;