- Change some operator returnn types. - Use std::map instead of std::unordered on magic number maps. - Some improvements.