Updates and remove typos