Sort lines, remove commas.
Add some missing modules.