added a bunch of stuff -- too many to list.