Fixed errors and typos

After review from from Nami-Doc