Confirmation refactoring and minor bugfixes