Fix some typos, changed some bits