I've added some major functionality in the area of the error function.

Now, I test merging two branches. I've never done this before, so let's see how it goes!