Tweak some output.
More tidy up and added MQTT client.