Missing semicolons
Make std::pair work with range-based-for by adding begin()/end() overloads to std