Fix past two commits
Fix past two commits

I should not code/git while sleepy.

See I was attempting to make nice little chunks.

But now I have 2 nice little chunks, that both have breaking changes.

And then this chunk that fixes bugs in both of them.

I fear I have failed humanity.

Insoleet/quamash,aknuds1/quamash,graingert/quamash