a bit of cleaning of the ms (again, discussion left alone for time being)