Fix typos and mistakes (thanks @fredblain )