Fixed up TitanDataProvider; miscellaneous cleanup