Fix links, formatting of Class 3