Fix some bugs, can run now