Minor cleanup, and made the project runnable on windows.