- Updating config values.
- Slight modifications to model.
Revert "- Slight modifications to model."

This reverts commit 2dc56465ffecd3e85327e348323e14fcffa50da3.
- Changing author.
Merge origin/master