fixes #8

Changes are listed/explained in #8.

Since this is split across several commits, I probably should have done like a git rebase to edit the commit history to merge these into one big commit.  I kind of figures that there'd be a single diff to review here; I guess that's one thing that Crucible dos automatically that Github doesn't.