hi guys

I pushed a couple of cs in the unstable stream.
- Please check your your fixes are solving the problems you were fixing.
- There are some pending cs with a conflicts tag by marcus or me so 
please have a look (I do not want to solve conflicts
nor can nor is willing to push them in unstable in that state).
- Please have a look at the enh were I explicit mentioned help.

Stef