main section fixes