Bugs to fix

This pull request addresses issues #2 and #10. Details and discussion can be found on each of those. 

requested reviewers
@kmwoley
@andybardwell

and anyone else who wants