std::vectors, some fixes.