fix memory, fix separators