some patches

perhaps it is, you decide it : )