more windows improvements