Recovered Windows version and updated a bit of code