use proper url + update error messages