#6 A few general changes.