more data and minor fixes