some fixes in .cpp filez