Moving back, and correcting some things in the build file