Fix links. Closes #5, Closes #6. Thanks @martin-hewitt.
Fix headers