Better delimiters, cross-platform fixes