Updated doc and fixed typos