windows code fixes added to the client, tested and compiled