Converted more stuff over to std::string,vector,map.