more windows and other fixes