Fix separators, add split wrapper.