Fixes used of strlen(...), now need to fix use of strtok