Fixed some typos, a few helpers