Cleaned up the descriptions and the notes, and updated the JSON
structure so the sub-elements can show