diff --git a/readme.md b/readme.md
index 3cc007e3b7..8a4cd93b30 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,7 @@ documentation.
 Compiling the Nim compiler is quite straightforward. Because
 the Nim compiler itself is written in the Nim programming language
 the C source of an older version of the compiler are needed to bootstrap the
-latest version. The C sources are available in a separate repo [here](http://github.com/nim-code/csources).
+latest version. The C sources are available in a separate repo [here](http://github.com/nim-lang/csources).
 
 Pre-compiled snapshots of the compiler are also available on
 [Nimbuild](http://build.nim-lang.org/). Your platform however may not 
@@ -32,7 +32,7 @@ If you are on a fairly modern *nix system, the following steps should work:
 ```
 $ git clone git://github.com/Araq/Nim.git
 $ cd Nim
-$ git clone --depth 1 git://github.com/nim-code/csources
+$ git clone --depth 1 git://github.com/nim-lang/csources
 $ cd csources && sh build.sh
 $ cd ..
 $ bin/nim c koch
diff --git a/tests/parallel/t5000.nim b/tests/parallel/t5000.nim
new file mode 100644
index 0000000000..025c327fa7
--- /dev/null
+++ b/tests/parallel/t5000.nim
@@ -0,0 +1,22 @@
+discard """
+  output: '''50005000'''
+"""
+
+import threadpool, strutils
+
+proc foo(x: int): string = $x
+
+proc main() =
+  var a = newSeq[int]()
+  for i in 1..10000:
+    add(a, i)
+
+  var s = 0
+  for i in a:
+    s += parseInt(^spawn(foo(i)))
+  echo s
+
+setMaxPoolSize 2
+
+parallel:
+  spawn main()
diff --git a/todo.txt b/todo.txt
index 52b26f0060..a6ea315606 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,9 +1,8 @@
 version 0.10
 ============
 
-- find out why global installations end up using the wrong stdlib
-- implement 'procCall'
 - make nimble part of the distribution
+- implement 'procCall'
 - split idetools into separate tool
 - split docgen into separate tool
 
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim
index 022b14209e..9ee3eb9b96 100644
--- a/tools/niminst/niminst.nim
+++ b/tools/niminst/niminst.nim
@@ -148,7 +148,7 @@ Options:
   -h, --help          shows this help
   -v, --version       shows the version
 Compile_options:
-  will be passed to the Nimrod compiler
+  will be passed to the Nim compiler
 """
 
 proc parseCmdLine(c: var TConfigData) =
diff --git a/web/community.txt b/web/community.txt
index 958f7aea1e..bac5e0ada8 100644
--- a/web/community.txt
+++ b/web/community.txt
@@ -17,7 +17,7 @@ IRC is the perfect place for people just starting to learn Nim and we
 welcome any questions that you may have!
 
 You may also be interested in reading the
-`IRC logs <http://build.nim-code.org/irclogs/>`_ which are an archive of all
+`IRC logs <http://build.nim-lang.org/irclogs/>`_ which are an archive of all
 of the previous discussions that took place in the IRC channel.
 
 Github
@@ -28,9 +28,9 @@ Together with the `wiki <http://github.com/Araq/Nim/wiki>`_ and
 `issue tracker <http://github.com/Araq/Nim/issues>`_.
 
 Github also hosts other projects relating to Nim. These projects are a part
-of the `nim-code organisation <http://github.com/nim-code>`_.
-This includes the `Babel package manager <http://github.com/nim-code/babel>`_
-and its `package repository <http://github.com/nim-code/packages>`_. 
+of the `nim-lang organisation <http://github.com/nim-lang>`_.
+This includes the `Babel package manager <http://github.com/nim-lang/babel>`_
+and its `package repository <http://github.com/nim-lang/packages>`_. 
 
 Twitter
 =======
@@ -59,9 +59,9 @@ There are always many things to be done in the main
 `issues <https://github.com/Araq/Nim/issues>`_ for 
 things to do; pull requests are always welcome. You can
 also contribute to the many other projects hosted by the
-`nim-code <https://github.com/nim-code>`_ organisation on github. If you
+`nim-lang <https://github.com/nim-lang>`_ organisation on github. If you
 can't find anything you fancy doing, you can always ask for inspiration on IRC
-(irc.freenode.net #nim) or on the `Nim forums <http://forum.nim-code.org>`_.
+(irc.freenode.net #nim) or on the `Nim forums <http://forum.nim-lang.org>`_.
 
 Donations
 ---------