Structure corrections, some text corrections