Responding to feedback

Attempt to address [#11] and [#13].