Some improvements

I was blind and now i see... a little bit better :)