fixed all references to old settings