More bugfixes, delete confirmations