Some fixes to documentation.
Merge ../stacker