Updating typos and moving stuff around