This way it is shared with diesel, which simplifies a lot the setup Also fixes a few issues in the documentation, that are not directly related