lots more collision stuff, window size fixes