#14 fix some URL and comments