Fix errors, add more links