Some code cleanup.
Changes to configs and additonal validation.
Fixed some bugs. Testing git stuff.