Correct a few more merge errors, add new files to makefile.