Comment alignments
Couple of signedness updates
Make sure we get the data we need from strtok
Update test to work on 2.8 too
Fixed couple of mem leaks