Fixed some errors, and updated the build file.