lots of fixes
TODO: match through the csv
Merge remote-tracking branch 'origin/master'