Headings added and mosquitto section expanded