Comments additions/corrections + URLShortener example