Hi,
I'm resending the first patch which has cosmetic changes such
as indentation, change in comment styles, variable name changes.
I'll follow up with subsequent patches.

Thanks,
Ravi