Fixed typos, added extra clauses