more locking and diagnostics

3 jobs for NIFTy_4 in 6 minutes and 38 seconds (queued for 2 seconds)