Fixed typos, changed terms