added waiver, and fixed typos