Renamed uri to url, other small fixes.
Update config file.