Fix major bugs on confirmations
Update doc