And fixing some typos because I'm a dummy