Small updates by Lars.
Arnd's Comments.