Tweak descriptions, add subheaders