Clean up writing, fix some links