update defaults and begin to add term ordering