more bugfixes, but the window still needs a resize after an incremental reflow, essentially negating the whole thing