I'm actually testing it under windows, and most of the changes I introduced are for cross-platform compatibility.