Fixed more errors. close #1