She said I'd be tweaking it, she was right!!!
Update Types to use size_t and other more suitable typedefs.
Define a variables usage and meaning.... it's all in the metadata