fixed the 'ever lengthening msg' syndrome and probably made the whole