R6.0.1.final

Some changes we think they are not bad things.