Use StrBuf instead of str for wrapped
Fixed iterator bug due to API change
Change to new vector syntax