Modified name size (was one too large I believe).
Also, I changed a for loop to compile under
standard C (no declarations in for loop).