Small improvements

I need YOUR help ;)