fixes issues brought up during PR 35 review