address issues in #17

Address comments by @danielrichman on #17.

@danielrichman should merge this if/when he's' happy.