more correct sizing; simplify doc structure