more changes

Here you go an other batch ...