Many changes, study problems updated partially through 16.6