Added first run, fix some bugs