fixed bugs, running again