Fix safari issues

- The weirdest thing: using a list caused safari to get completely
  wedged and hung-up. What is going on there? Well, using a vector seems
  to have fixed the issue, so stay tuned.