fixed bugs, added data