Improve sections per M's advices.