fix bugs introduced in PR#2

[strega-nil]

nicole is a dummy

[ThePhD]

... Wait a second, it pushed here? Just directly???

I was gonna send a diff or something. Ah, well, just lemme know if it looks okay, I modified it slightly and tried to make it work better for Windows! (Most of the tests compile and run now, modulo a known bug with large structs.)

[strega-nil]

@ThePhD if you want to just post a diff, you can either:

• open a PR against my branch, or
• git format-patch --stdout HEAD^ (with N ^'s for however many commits you needed) and then copy-pasting that into gh here

[ThePhD]

Ah, alright. Gotcha! I'll do that next time.

This one okay-to-merge, now?