ok some fucking tweaks ;)