Fix some logic in 'join'
Add restoration from disk SKELETON