Added confirmation process

- Some bug fixing and adjustments