merging
fixing typos