Cleaned up log and fixed STR not parsing