Updates to the windowing code