3 small improvments 

Hi,

I've added 3 small modifications, that might be interesting for others, too.

Greetings,
Fredyy