More updated and a few typo fixes