more improvements

Ok, i understood your point. :+1: