diff git a/doc/new/_posts/10001210quickstart.md b/doc/new/_posts/10001210quickstart.md
index 9bd34f0144ca7190858e856303cb86849e628153..e7324d7229911f34c49292ff1cba29616f03fd86 100644
 a/doc/new/_posts/10001210quickstart.md
+++ b/doc/new/_posts/10001210quickstart.md
@@ 2,7 +2,7 @@
layout: post
title: "QTT Decomposition"
date: 10001210
topic: "Quickstart"
+topic: "Examples"
section: "Examples"

__tabsInit
diff git a/doc/new/documentation.md b/doc/new/documentation.md
index 227d07cf008d76b1f6ff7f0f8e52c557d019d7d2..2cf71279e21a524ec5b285ef15145a436391fbe2 100644
 a/doc/new/documentation.md
+++ b/doc/new/documentation.md
@@ 3,54 +3,27 @@ layout: post
section: "Documentation"

# xerus  a general purpose tensor library {#mainpage}

## Introduction

The `xerus` library is a general purpose library for numerical calculations with higher order tensors, TensorTrain Decompositions / Matrix Product States and general Tensor Networks.
The focus of development was the simple usability and adaptibility to any setting that requires higher order tensors or decompositions thereof.

The key features include:
* Modern code and concepts incorporating many features of the new `C++11` standard.
* Calculation with tensors of arbitrary orders using an intuitive Einsteinlike notation `A(i,j) = B(i,k,l) * C(k,j,l);`.
* Full implementation of the TensorTrain decompositions (MPS) with all neccessary capabilities (including Algorithms like ALS, ADF and CG).
* Lazy evaluation of multiple tensor contractions featuring heuristics to find the most effective contraction order.
* Direct integration of the `blas` and `lapack`, as high performance linear algebra backends.
* Fast sparse tensor calculation by usage of the `suiteSparse` sparse matrix capabilities.
* Capabilites to handle arbitrary Tensor Networks.

## Version History

We released our first stable version 1.0 in May 2015 and are currently at version 2.2.1. It can be obtained via [git](https://git.hemio.de/xerus/xerus) or as an archived download via the same link.
The current development version is also available in the same git repository (branch 'development') and it might include more features than the latest stable release, but be adviced that these development versions are particularly bad documented and might change drastically from one day to the next.

## Getting Started

There are a number of tutorials to get you started using the `xerus` library.
* [Building xerus](@ref md_building_xerus)  instruction on how to build the library iteself and your first own program using it.
* [QuickStart guide](_quick_startexample.html)  a short introduction into the basic `xerus` functionality.
* [Tensor Class](@ref md_tensor)  an introduction into the most important functions relating to the `xerus::Tensor` class.
* [TT Tensors](_t_t_tensors_01_07_m_p_s_08example.html)  using the MPS or TensorTrain decomposition.
* [Optimization](@ref md_optimization)  some hints how to achieve the fastest possible numerical code using `xerus`.
* [Debugging](@ref md_tut_debugging)  using `xerus`'s capabilities to debug your own application.

## Issues

Should you have any problems with the library do not hesitate to contact us at [contact[at]libxerus.org](mailto:contact[at]libxerus.org) or describe your problem in the [issuetracker](https://git.hemio.de/xerus/xerus/issues).


## Licence and Attribution

The `xerus` library is published under the AGPL v3.0. With proper attribution you are thus allowed to freely use and modify the source code but if you distribute your software including the `xerus`
library (or you provide a service based on this library) you have to provide the full source code under a compatible licence. For more information see the [AGPL](http://www.gnu.org/licenses/agpl3.0.html).

If this library proved useful in your scientific research we would be grateful for any contributions to the source code and citations. As there is no related article yet, a corresponding bibtex
entry might look as follows
~~~
@Misc{xerus,
 author = {Huber, Benjamin and Wolf, Sebastian},
 title = {Xerus  A General Purpose Tensor Library},
 howpublished = {\url{https://libxerus.org/}},
 year = {20142017}
}
~~~
+# Documentation
+
+This is the semicomplete documentation of the `xerus` library. It does not provide you with precise function declarations or
+class hierarchies (check out the [doxygen documentation](doxygen) for those) but instead focuses on small working code snippets
+to demonstrate `xerus`'s capabilities.
+
+The documentation is categorized into chapters that each focus on individual features of the library. In particular the chapters in the "Basic
+Usage" section only build upon the knowledge of the previous chapters so that they can easily be read in order. They are still
+useful as lookup resources later on though.
+
+If you have not already done so, you will most likely want to start by downloading and [building xerus](building_xerus). If
+you are uncertain or confused by our nomenclature at any point you can reference the [nomenclature](nomenclature) chapter which
+should hopefully allow you to deduce the meaning of all tensor specific terms we use.
+
+The "Basic Usage" section starts out with the creation and modification of (sparse or dense) tensors ([The Tensor Class](tensor)),
+how to use them in indexed equations to denote contractions, summations etc. ([Indices and Equations](indices)) and finally
+how to denote generalizations of matrix decompositions ([Decompositions and Solve](decompositions)) before explainig any more
+elaborate tensor format. The focus of `xerus` so far clearly lies on the Tensor Train decomposition ([TTTensors](tttensors)) and
+algorithms for those to solve least squares problems ([Alternating Algorithms](als), [Riemannian Algorithms](riemannian)) or
+tensor recovery and completion problems ([Tensor Completion / Recovery](completion)). It is possible to use `xerus`'s capabilities
+to construct and contract arbitrary tensor networks though ([General Tensor Networks](tensornetworks)).
+
+In the "Advanced Usage" section you find instructions on how to optimize your usage of the `xerus` library to gain those last
+1020% of speedup ([Optimization](optimization)) and explanations of the debugging tools that `xerus` gives you ([Debugging](debugging)).
diff git a/doc/new/examples.md b/doc/new/examples.md
index 7b6ee90e496ae2fc985168e044aa435fa220e5ad..70c831501fc333d2202c6d217aa978780b792815 100644
 a/doc/new/examples.md
+++ b/doc/new/examples.md
@@ 4,3 +4,10 @@ section: "Examples"

# Examples
+
+Functional examples of library usage can help you to quickly gauge if it is the library you are looking for, can be very instructive
+on how to practically use its capabilities and even serve as starting points for you own algorithms and programs. This is why
+we think it is very important to make practical examples available with a library.
+
+Naturally this section could (always!) use more examples. So please do not hesitate to send us any code you have written using the
+`xerus` library, including comments and explanations, to [contact{at}libxerus.org](mailto:contact@libxerus.org).
diff git a/doc/new/index.md b/doc/new/index.md
index 43ad9290b422c75de517be4c47a879843188abc6..7a6c648072df4b48a2e78165a6b0b38a7cbb27ec 100644
 a/doc/new/index.md
+++ b/doc/new/index.md
@@ 6,8 +6,6 @@ subtitle: "a general purpose tensor library"
# Xerus
## Introduction

The `xerus` library is a general purpose library for numerical calculations with higher order tensors, TensorTrain Decompositions / Matrix Product States and general Tensor Networks.
The focus of development was the simple usability and adaptibility to any setting that requires higher order tensors or decompositions thereof.
@@ 24,15 +22,14 @@ The key features include:
## Getting Started
+`xerus` can be obtained via [git](https://git.hemio.de/xerus/xerus) or as an archived download via the same link.
+To build and install the library you might want to check our the [Building xerus](building_xerus) guide.

There are a number of tutorials to get you started using the `xerus` library.
* [Building xerus](@ref md_building_xerus)  instruction on how to build the library iteself and your first own program using it.
* [QuickStart guide](_quick_startexample.html)  a short introduction into the basic `xerus` functionality.
* [Tensor Class](@ref md_tensor)  an introduction into the most important functions relating to the `xerus::Tensor` class.
* [TT Tensors](_t_t_tensors_01_07_m_p_s_08example.html)  using the MPS or TensorTrain decomposition.
* [Optimization](@ref md_optimization)  some hints how to achieve the fastest possible numerical code using `xerus`.
* [Debugging](@ref md_tut_debugging)  using `xerus`'s capabilities to debug your own application.
+Where to go from there depends on what you want to do with `xerus` and how you learn. You can quickly get a feeling for the library
+by checking out one of the simpler examples like [QTT](quickstart). For most people the more elaborate [documentation](documentation)
+will likely be the place to start though. Apart from the basic usage it also explains the mindset behind many design choices and
+so is adviced reading material regardless of how deep you want to delve into the library. Finally for the most hardcore developers
+out there, there is an elaborate [doxygen documentation](doxygen).
## Issues