Some minor changes. Weird bug with std::string