Fix typos and small tweaks