Updated config to proper API version.
Some minor cleanup.