Update and improvements to the Nimrod version

I ended up removing the comments, but you may wish to undo it.