Reviewed what was done since I last worked on the project and made it compiling under Windows again