big doc and format cleanup