fix link, make a few things more consistent