Fixing more typos and adding suggestions from Danbev