Updated various items, fixed some typos