more definitions; edits and new copy