Use https links where possible

- Also fix a typo and remove some trailing whitespace