Updated according to workshop and also cleaned up links and added missing whitespace after 'Hubben'