True fixes for command line utility this time. It should now work on windows