Added confirmations, fixes