Fix typos and make other small tweaks