Sander's changes tested, OK,
Some little fixes added
More qualifiers for class changes added