Tidied up file; still many errors with links