Several possible updates based on JIRA tickets
see individual commit messages. These updates address the issues described in the following JIRA tickets: https://my.usgs.gov/jira/projects/MDW/issues/MDW-2 https://my.usgs.gov/jira/projects/MDW/issues/MDW-8 https://my.usgs.gov/jira/projects/MDW/issues/MDW-7