added config options.Unfixed earlier fix