fixed some more window things

aaaaagh it's slow