minor updates to make it useable on windows