few config TODOs eliminated