Various typo/referral updates thanks to Francesco Turco