Finally, full descriptions
Minor cleaning/commenting
Hopefully this works in GFM