Minor updates made while working on other tasks

- includes the fix to issue #108