Made the code run on Windows
Added better scenarios