more data fixes