Let undo work after verify period
Fixed deleting prev residents
Merge branch 'master' into kingman