Fixed some typos, re-order blocks