fixed a few more bugs in confirmation