Re-factored MQTTS Library, Main, minor changes OD