Fixed typos, added terms and stuff