Sections correctly added only before option is available so far, add package bug fixed.
Refactoring
Minor bugs
Tiny refactor =)