Modified std/map to use standard arrays
Changes I forgot to commit earlier, vector is busted