fixes 266
fixes 267
a bit less transparency
Merge pull request #274 from NICTA/data_fixes

Data fixes