Improvements

I have made several fixes and improvements (from my point of view :-)) ...