Fix most issues

Resolved #1 issue.