Small improvements.

I have done some small improvements (too many files but very small changes :-) ).