add some index functions
StrBuf -> String
update for latest master-ish