1. strncpy needs to include the source string's NULL. 2. Deleted a few redundant string modifications.