Update and fix the documentation after all the changes specified in #151. This should get checked by someone for comprehensibility :)