Fixed lingering typos and unmade changes from previous commits