structure documentation and other fixes