Update, fix typo on keynotes, and litle tweaks