test changes, regex replace, only replacing when join character is present and a few other changes...