Reorganise sections and fix a few other issues.