added new data and fixed some bugs