Tighten writing and fix link