1) Fix some typos
2) Move around the things