Trying to finish unicode support. Changed ordered_map to use list instead of vector for faster inserts/removals.