Add most of Steiner's suggestions