Added confirmation to destructive operations
fixed confirmations
merged upstream