Fixes to deferred join, fixes #50
Rework on the verification system, fixes #58