changes to make this play well on windows