Fixing variable names to obey a default pattern and making fixes
Updating TODO