reorg sections and add extras