diff --git a/todo.txt b/todo.txt
index b0181b2413..302178b963 100644
--- a/todo.txt
+++ b/todo.txt
@@ -46,7 +46,6 @@ Bugs
 - VM: Pegs do not work at compile-time
 - VM: ptr/ref T cannot work in general
 - scopes are still broken for generic instantiation!
-- bug: type conversions concerning proc types are weird
 - compilation of niminst takes way too long. looks like a regression
 - docgen: sometimes effects are listed twice
 - blocks can "export" an identifier but the CCG generates {} for them ...
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index 0242e498ee..23d1ef4d9f 100644
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
@@ -436,7 +436,7 @@ initConfigData(c)
 parseCmdLine(c)
 parseIniFile(c)
 when false:
-  buildPdfDoc(c, "doc")
+  #buildPdfDoc(c, "doc")
   buildWebsite(c)
 else:
   main(c)
diff --git a/tools/website.tmpl b/tools/website.tmpl
index 88a4dee67c..9f655a04cb 100644
--- a/tools/website.tmpl
+++ b/tools/website.tmpl
@@ -136,7 +136,7 @@ p.greet() <span class="cmt"># or greet(p)</span>
 						<h4>Documentation</h4>
 						<a href="documentation.html">Stable Documentation</a>
 					<!--	<a href="">Development Documentation</a> -->
-						<a href="https://github.com/Araq/Nimrod">Github Issues &amp; Requests</a>
+						<a href="https://github.com/Araq/Nimrod">Issues &amp; Requests</a>
 					</div>
 					<div>
 						<h4>Community</h4>
@@ -146,9 +146,9 @@ p.greet() <span class="cmt"># or greet(p)</span>
 					</div>
 				</div>
 				<div id="foot-legal">
-					<h4>Written in Nim - Powered by <a href="#">Jester</a></h4>
-					Web Design by <a href="#">Philip Witte</a> &amp; <a href="#">Dominik Picheta</a><br>
-					Copyright © 2014 - <a href="#">Andreas Rumpf</a> &amp; <a href="#">Contributors</a>
+					<h4>Written in Nim - Powered by <a href="https://github.com/dom96/jester">Jester</a></h4>
+					Web Design by <a href="http://reign-studios.net/philipwitte/">Philip Witte</a> &amp; <a href="http://picheta.me/">Dominik Picheta</a><br>
+					Copyright © 2014 - <a href="http://nim-lang.org/blog/">Andreas Rumpf</a> &amp; <a href="https://github.com/Araq/Nimrod/graphs/contributors">Contributors</a>
 				</div>
 			</div>
 		</footer>
diff --git a/web/news.txt b/web/news.txt
index 2c1700489c..9971ed7242 100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -373,8 +373,6 @@ We are pleased to announce that version 0.9.2 of the Nimrod compiler has been
 released. This release has attracted by far the most contributions in comparison
 to any other release.
 
-This release can be downloaded from `here <download.html>`_.
-
 This release brings with it many new features and bug fixes, a list of which
 can be seen later. One of the major new features is the effect system together
 with exception tracking which allows for checked exceptions and more, 
diff --git a/web/nim.ini b/web/nim.ini
index 8145317b9c..6face49bc9 100644
--- a/web/nim.ini
+++ b/web/nim.ini
@@ -19,7 +19,7 @@ docs: documentation
 learn: learn
 download: download
 forum: "http://forum.nim-lang.org"
-FAQ: question
+faq: question
 # these two are not in the list of "tabs", but do exist:
 community: community
 news: news
diff --git a/web/question.txt b/web/question.txt
index 23d3b9b670..8f48c16404 100644
--- a/web/question.txt
+++ b/web/question.txt
@@ -117,9 +117,9 @@ General
   -------------------------
 
   *Procedure* used to be the common term as opposed to a *function* which is a
-  mathematical entity that has no side effects. It was planned to have ``func``
-  as syntactic sugar for ``proc {.noSideEffect.}`` but with the more fine-grained
-  effect system it is not yet clear what ``func`` should be a shortcut for.
+  mathematical entity that has no side effects. It is planned to have ``func``
+  as syntactic sugar for ``proc {.noSideEffect.}`` and ``func`` is already a
+  keyword.
 
 
 Compilation