Changed strncat() calls to safe_str() and safe_format() to be more in line with how it should be.