Fixed some typos, moved key into new block