sorted some more windows problems