Touch ups
Merge pull request #31 from Excelsior-Systems/James_mar20

Touch ups