Split/add and fixes

Should these be `endswith`?