Add fix for makeLink method so it returns links that already have a host, fix indenting.