Attempted to correct util::swap and split_options_iter usage, changed *s to (*s), and added .to_str() to a string slice method call.