Adjust the some error messages as suggested during re@ review, and adjust a comment that won't be true shortly.
Adjust the some error messages as suggested during re@ review, and
adjust a comment that won't be true shortly.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase