Fix: sections generator was too greedy
Fix typo
Improvements of the generator