fixed a couple issues with moral data source, general cleanup