Needed changes only

[virgilbourassa]

I've minimized the number of changes to your library required for my use of it to work properly.

(I'd recommend doing a squash and merge to eliminate my many intervening commits.)