Added the error fixes. Fixes #3.