Merge pull request #17 from University-of-Auckland/develop-misc-fixes

Develop misc fixes
Merge branch 'aaf-develop' into code-develop