Renamed uri to url, other small fixes.