c w patch, plus some attempt to move towards C++, removed some capitalized local variables