Fixing a bunch of typos and changes