sync from Atlas repo
fixing typos