Fixed various str-related logick
5 files changed