Wouter01000 fix, and some other fixes as there released by other people.