set P and Exapnsion back to 10/Spherical
minor fix: disabled debug dump in upward phase
minor fix: indentation
minor fix: added doxygen comments and removed spaces in nested templates (C++11 does not need spaces between > >)