finish job and build, fix some bugs