Fixed all of the confirmations and notifications