changes to address issues brought up during testing by @kusnier