more and more fixes FUCK