added more data, fixed some bugs