Fix links to work
Remove highlight comments