00.20.46.140731

* Changing config variable names so they make more sense
* Lots of code changes and optimization
* Lots of comment updates