fixed a few bugs in confirmation