Allow -j1

Also fix so that the main thread is counted in the J number.