fixed bugs, now is running