random patches

random things that seem to work on my machine, have to run now so will clean later just FYI
It does not produce scrollbar on mine at least.