Updated some .cpp files