Minor bug fixes
Merge pull request #7 from JamesGlover/update_to_support_frontend

Minor bug fixes