datasource code fixes
Readme format fixes