Update to fix prefix issue.  Also fixes a few other bugs.  Should close #6.