modified c++ source files with issues