Updated URL + improved messages