Now polls if still forking, smoothing UX
Merge branch 'forking'