Fixes; change document structure.