small cleanups to syntax and changing bsd/string.h to string.h, yay portability!