changed all strings in headers to std::string