new data and some fixes