Fixing typos and missing things (thanks to ksuszka).