fixed one bug and added data