Fix broken URL and cosmetic fixes

[skip ci]