bug fixes, more friendly confirm